From 47ac0db66cb63901976a1ecda3767655b8695fca Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 16 Apr 2020 23:58:01 -0400 Subject: [PATCH] viewport: Drop shadow-type The viewport draws a frame at the same place as the scrolled window, so there is really no need to have that ability in both. Just drop the frame from viewports. --- docs/reference/gtk/gtk4-sections.txt | 2 - gtk/gtkviewport.c | 69 +--------------------------- gtk/gtkviewport.h | 7 --- gtk/ui/gtkplacesview.ui | 2 - gtk/ui/gtkprintunixdialog.ui | 4 -- 5 files changed, 2 insertions(+), 82 deletions(-) diff --git a/docs/reference/gtk/gtk4-sections.txt b/docs/reference/gtk/gtk4-sections.txt index 659b9eee31..419c38371b 100644 --- a/docs/reference/gtk/gtk4-sections.txt +++ b/docs/reference/gtk/gtk4-sections.txt @@ -3841,8 +3841,6 @@ gtk_list_store_get_type GtkViewport GtkViewport gtk_viewport_new -gtk_viewport_set_shadow_type -gtk_viewport_get_shadow_type GTK_VIEWPORT GTK_IS_VIEWPORT diff --git a/gtk/gtkviewport.c b/gtk/gtkviewport.c index fafdfb7eb4..c257bc741b 100644 --- a/gtk/gtkviewport.c +++ b/gtk/gtkviewport.c @@ -75,8 +75,7 @@ struct _GtkViewportPrivate { GtkAdjustment *hadjustment; GtkAdjustment *vadjustment; - GtkShadowType shadow_type; - + /* GtkScrollablePolicy needs to be checked when * driving the scrollable adjustment values */ guint hscroll_policy : 1; @@ -93,8 +92,7 @@ enum { PROP_HADJUSTMENT, PROP_VADJUSTMENT, PROP_HSCROLL_POLICY, - PROP_VSCROLL_POLICY, - PROP_SHADOW_TYPE + PROP_VSCROLL_POLICY }; @@ -254,15 +252,6 @@ gtk_viewport_class_init (GtkViewportClass *class) g_object_class_override_property (gobject_class, PROP_HSCROLL_POLICY, "hscroll-policy"); g_object_class_override_property (gobject_class, PROP_VSCROLL_POLICY, "vscroll-policy"); - g_object_class_install_property (gobject_class, - PROP_SHADOW_TYPE, - g_param_spec_enum ("shadow-type", - P_("Shadow type"), - P_("Determines how the shadowed box around the viewport is drawn"), - GTK_TYPE_SHADOW_TYPE, - GTK_SHADOW_IN, - GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY)); - gtk_widget_class_set_css_name (widget_class, I_("viewport")); } @@ -299,9 +288,6 @@ gtk_viewport_set_property (GObject *object, g_object_notify_by_pspec (object, pspec); } break; - case PROP_SHADOW_TYPE: - gtk_viewport_set_shadow_type (viewport, g_value_get_enum (value)); - break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -331,9 +317,6 @@ gtk_viewport_get_property (GObject *object, case PROP_VSCROLL_POLICY: g_value_set_enum (value, priv->vscroll_policy); break; - case PROP_SHADOW_TYPE: - g_value_set_enum (value, priv->shadow_type); - break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -350,7 +333,6 @@ gtk_viewport_init (GtkViewport *viewport) gtk_widget_set_overflow (widget, GTK_OVERFLOW_HIDDEN); - priv->shadow_type = GTK_SHADOW_IN; priv->hadjustment = NULL; priv->vadjustment = NULL; @@ -441,53 +423,6 @@ viewport_set_adjustment (GtkViewport *viewport, gtk_viewport_adjustment_value_changed (adjustment, viewport); } -/** - * gtk_viewport_set_shadow_type: - * @viewport: a #GtkViewport. - * @type: the new shadow type. - * - * Sets the shadow type of the viewport. - **/ -void -gtk_viewport_set_shadow_type (GtkViewport *viewport, - GtkShadowType type) -{ - GtkViewportPrivate *priv = gtk_viewport_get_instance_private (viewport); - - g_return_if_fail (GTK_IS_VIEWPORT (viewport)); - - if ((GtkShadowType) priv->shadow_type != type) - { - priv->shadow_type = type; - - if (type != GTK_SHADOW_NONE) - gtk_widget_add_css_class (GTK_WIDGET (viewport), GTK_STYLE_CLASS_FRAME); - else - gtk_widget_remove_css_class (GTK_WIDGET (viewport), GTK_STYLE_CLASS_FRAME); - - g_object_notify (G_OBJECT (viewport), "shadow-type"); - } -} - -/** - * gtk_viewport_get_shadow_type: - * @viewport: a #GtkViewport - * - * Gets the shadow type of the #GtkViewport. See - * gtk_viewport_set_shadow_type(). - * - * Returns: the shadow type - **/ -GtkShadowType -gtk_viewport_get_shadow_type (GtkViewport *viewport) -{ - GtkViewportPrivate *priv = gtk_viewport_get_instance_private (viewport); - - g_return_val_if_fail (GTK_IS_VIEWPORT (viewport), GTK_SHADOW_NONE); - - return priv->shadow_type; -} - static void gtk_viewport_size_allocate (GtkWidget *widget, int width, diff --git a/gtk/gtkviewport.h b/gtk/gtkviewport.h index f034c4c055..45188923b0 100644 --- a/gtk/gtkviewport.h +++ b/gtk/gtkviewport.h @@ -50,13 +50,6 @@ GDK_AVAILABLE_IN_ALL GtkWidget* gtk_viewport_new (GtkAdjustment *hadjustment, GtkAdjustment *vadjustment); -GDK_AVAILABLE_IN_ALL -void gtk_viewport_set_shadow_type (GtkViewport *viewport, - GtkShadowType type); -GDK_AVAILABLE_IN_ALL -GtkShadowType gtk_viewport_get_shadow_type (GtkViewport *viewport); - - G_END_DECLS diff --git a/gtk/ui/gtkplacesview.ui b/gtk/ui/gtkplacesview.ui index 6b9a1ca6ea..bd1f012be5 100644 --- a/gtk/ui/gtkplacesview.ui +++ b/gtk/ui/gtkplacesview.ui @@ -153,7 +153,6 @@ 200 - none none @@ -188,7 +187,6 @@ 1 - none none diff --git a/gtk/ui/gtkprintunixdialog.ui b/gtk/ui/gtkprintunixdialog.ui index cd3801b3e6..ef13dc406d 100644 --- a/gtk/ui/gtkprintunixdialog.ui +++ b/gtk/ui/gtkprintunixdialog.ui @@ -977,7 +977,6 @@ 1 - none 6 @@ -1007,7 +1006,6 @@ never - none 6 @@ -1037,7 +1035,6 @@ never - none 6 @@ -1067,7 +1064,6 @@ never - none vertical -- 2.30.2